Skip to content

Revert performance-sensitive change in #82436 #83293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 20, 2021
Merged

Revert performance-sensitive change in #82436 #83293

merged 1 commit into from
Mar 20, 2021

Conversation

osa1
Copy link
Contributor

@osa1 osa1 commented Mar 19, 2021

This change was done in #82436, as an "optimization". Unfortunately I
missed that this code is not always executed, because of the "continue"
in the conditional above it.

This commit should solve the perf regressions introduced by #82436 as I
think there isn't anything else that could affect runtime performance in
that PR. The Pick type grows only one word, which I doubt can cause up
to 8.8% increase in RSS in some of the benchmarks.

Could someone with the rights start a perf job please?

@osa1
Revert performance-sensitive change in #82436
f925757 
This change was done in #82436, as an "optimization". Unfortunately I
missed that this code is not always executed, because of the "continue"
in the conditional above it.

This commit should solve the perf regressions introduced by #82436 as I
think there isn't anything else that could affect runtime performance in
that PR. The `Pick` type grows only one word, which I doubt can cause up
to 8.8% increase in RSS in some of the benchmarks.
@rust-highfive
Copy link
Contributor

r? @varkor

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 19, 2021
@osa1 osa1 mentioned this pull request Mar 19, 2021
Merged
7 tasks
@jyn514
Copy link
Member

jyn514 commented Mar 19, 2021

@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 19, 2021
@bors
Copy link
Collaborator

bors commented Mar 19, 2021

⌛ Trying commit f925757 with merge cec4d3de4e29e63a5e96e00a156057ceef9aafad...

@bors
Copy link
Collaborator

bors commented Mar 19, 2021

☀️ Try build successful - checks-actions
Build commit: cec4d3de4e29e63a5e96e00a156057ceef9aafad (cec4d3de4e29e63a5e96e00a156057ceef9aafad)

@rust-timer
Copy link
Collaborator

Queued cec4d3de4e29e63a5e96e00a156057ceef9aafad with parent eb95ace, future comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (cec4d3de4e29e63a5e96e00a156057ceef9aafad): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 19, 2021
@osa1
Copy link
Contributor Author

osa1 commented Mar 19, 2021

Great, this seems to solve the perf issue introduced in #82436. Let's merge this.

@varkor
Copy link
Contributor

varkor commented Mar 19, 2021

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 19, 2021

📌 Commit f925757 has been approved by varkor

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2021
@bors
Copy link
Collaborator

bors commented Mar 19, 2021

⌛ Testing commit f925757 with merge a142e00ce2ccc52f7349c40b4cb927e9f3e7e0d9...

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
 45  516M   45  237M    0     0  28.9M      0  0:00:17  0:00:08  0:00:09 29.3M
 47  516M   47  245M    0     0  28.8M      0  0:00:17  0:00:08  0:00:09 28.9M
curl: (56) OpenSSL SSL_read: Connection was reset, errno 10054

gzip: stdin: unexpected end of file
tar: Unexpected EOF in archive
tar: Unexpected EOF in archive
tar: Error is not recoverable: exiting now
##[error]Process completed with exit code 2.
[command]"C:\Program Files\Git\bin\git.exe" version
git version 2.30.2.windows.1
[command]"C:\Program Files\Git\bin\git.exe" config --local --name-only --get-regexp core\.sshCommand
[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :"

@bors
Copy link
Collaborator

bors commented Mar 19, 2021

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 19, 2021
@jyn514
Copy link
Member

jyn514 commented Mar 19, 2021

curl: (56) OpenSSL SSL_read: Connection was reset, errno 10054

@bors retry

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 19, 2021
@bors
Copy link
Collaborator

bors commented Mar 20, 2021

⌛ Testing commit f925757 with merge cd82e45...

@bors
Copy link
Collaborator

bors commented Mar 20, 2021

☀️ Test successful - checks-actions
Approved by: varkor
Pushing cd82e45 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 20, 2021
@bors bors merged commit cd82e45 into rust-lang:master Mar 20, 2021
@rustbot rustbot added this to the 1.52.0 milestone Mar 20, 2021
@lcnr lcnr mentioned this pull request Apr 6, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 7, 2021
@bors
Auto merge of rust-lang#83932 - lcnr:probe-perf, r=estebank
b01026d 
use a `SmallVec` in `impl_or_trait_item`

rust-lang#83293 showed that this is fairly hot, slightly improves max-rss and cpu cycles, does not noticeably improve instruction counts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@varkor varkor

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.52.0
Development

Successfully merging this pull request may close these issues.
8 participants
@osa1 @rust-highfive @jyn514 @rust-timer @bors @varkor @rust-log-analyzer @rustbot